Model lexer: Fix remaining issues #24620
+982
−179
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.